(rmail-get-coding-system): Re-search

rmail-mime-charset-pattern directly instead of using
mail-fetch-field.  Use coding-system-from-name.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 99bdcea051660f73aedc09fe34d3fd14b5688d5c..a96b52b86029387fdeb1fd44aaf930312b59a293 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -940,13 +940,10 @@ This function also reinitializes local variables used by Rmail."
 (defun rmail-get-coding-system ()
   "Return a suitable coding system to use for the current mail message.
 The buffer is expected to be narrowed to just the header of the message."
-  (let ((content-type-header (mail-fetch-field "content-type"))
-       separator)
-    (save-excursion
-      (setq separator (search-forward "\n\n")))
-    (if (and content-type-header
-            (string-match rmail-mime-charset-pattern content-type-header))
-       (substring content-type-header (match-beginning 1) (match-end 1))
+  (save-excursion
+    (goto-char (point-min))
+    (if (re-search-forward rmail-mime-charset-pattern)
+       (coding-system-from-name (match-string 1))
       'undecided)))
 \f
 ;;; Set up Rmail mode keymaps